From: akw27@labyrinth.cl.cam.ac.uk <akw27@labyrinth.cl.cam.ac.uk>
Date: Fri, 6 Dec 2002 14:20:10 +0000 (+0000)
Subject: bitkeeper revision 1.7.1.7 (3df0b21aFrBUXjYnKdTMgt_D5mJJbg)
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~19116^2~3
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=5a4d8dc794608778815046c0846c0cc23e1c66f3;p=xen.git

bitkeeper revision 1.7.1.7 (3df0b21aFrBUXjYnKdTMgt_D5mJJbg)

conflict resolutions
---

5a4d8dc794608778815046c0846c0cc23e1c66f3
diff --cc BitKeeper/etc/logging_ok
index 24128f27c5,0abf014401..f55bd8cab9
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@@ -1,5 -1,3 +1,6 @@@
  akw27@boulderdash.cl.cam.ac.uk
+ akw27@labyrinth.cl.cam.ac.uk
 +kaf24@labyrinth.cl.cam.ac.uk
 +kaf24@plym.cl.cam.ac.uk
 +kaf24@striker.cl.cam.ac.uk
  smh22@boulderdash.cl.cam.ac.uk
diff --cc xen-2.4.16/common/domain.c
index 30b9209ccc,7dc00d062d..962ac5f38b
--- a/xen-2.4.16/common/domain.c
+++ b/xen-2.4.16/common/domain.c
@@@ -574,15 -568,11 +576,16 @@@ int setup_guestos(struct task_struct *p
  
      /* Add virtual network interfaces and point to them in startinfo. */
      while (params->num_vifs-- > 0) {
-         net_ring = create_net_vif(dom);
+         net_vif = create_net_vif(dom);
+         net_ring = net_vif->net_ring;
          if (!net_ring) panic("no network ring!\n");
      }
 -    virt_startinfo_address->net_rings = p->net_ring_base;
 +
 +/* XXX SMH: horrible hack to convert hypervisor VAs in SHIP to guest VAs  */
 +#define SHIP2GUEST(_x) (virt_shinfo_address | (((unsigned long)(_x)) & 0xFFF))
 +
 +    virt_startinfo_address->net_rings = 
 +	(net_ring_t *)SHIP2GUEST(p->net_ring_base); 
      virt_startinfo_address->num_net_rings = p->num_net_vifs;
  
      /* Add block io interface */